Adjust tests

diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 6e727f16b63af18ccd21f5c77b22ccfcb217367d..9aad57aa215727aa0b4ce7af6d22dab1e0c33ebc 100644 (file)
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -82,7 +82,7 @@ test_parser (void)
   
   error = NULL;
   gtk_builder_add_from_string (builder, "<interface invalid=\"X\"/>", -1, &error);
-  g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_ATTRIBUTE);
+  g_assert_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE);
   g_error_free (error);
 
   error = NULL;

diff --git a/testsuite/gtk/ui/celllayout5.expected b/testsuite/gtk/ui/celllayout5.expected
index 027a052673ffc467adc65db6069c3d342b79345c..e47a1a9402835448b6ba4ad1d60a59d63ddcc7ed 100644 (file)
--- a/testsuite/gtk/ui/celllayout5.expected
+++ b/testsuite/gtk/ui/celllayout5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:9:15 Unhandled tag: <warbl>

diff --git a/testsuite/gtk/ui/dialog5.expected b/testsuite/gtk/ui/dialog5.expected
index 027a052673ffc467adc65db6069c3d342b79345c..3a72c79f55cc1e67b05859a3cb3cfae97151b90e 100644 (file)
--- a/testsuite/gtk/ui/dialog5.expected
+++ b/testsuite/gtk/ui/dialog5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:11:13 Unhandled tag: <warbl>

diff --git a/testsuite/gtk/ui/filefilter10.expected b/testsuite/gtk/ui/filefilter10.expected
index 027a052673ffc467adc65db6069c3d342b79345c..6219088dbdfcf9997e1e205f26a7dd4efe3761a7 100644 (file)
--- a/testsuite/gtk/ui/filefilter10.expected
+++ b/testsuite/gtk/ui/filefilter10.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:4:13 Unhandled tag: <warbl>

diff --git a/testsuite/gtk/ui/infobar5.expected b/testsuite/gtk/ui/infobar5.expected
index 65dee44077d580a940e0f9853fcf66e204090a45..f1a9ff9be703eb9829b4bdf7463d70328dfb6c58 100644 (file)
--- a/testsuite/gtk/ui/infobar5.expected
+++ b/testsuite/gtk/ui/infobar5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <worbl>
+<input>:9:13 Unhandled tag: <worbl>

diff --git a/testsuite/gtk/ui/label5.expected b/testsuite/gtk/ui/label5.expected
index 027a052673ffc467adc65db6069c3d342b79345c..40c5dbc96e5184c71f899e57015c1eb97c225f5f 100644 (file)
--- a/testsuite/gtk/ui/label5.expected
+++ b/testsuite/gtk/ui/label5.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:6:13 Unhandled tag: <warbl>

diff --git a/testsuite/gtk/ui/levelbar6.expected b/testsuite/gtk/ui/levelbar6.expected
index 027a052673ffc467adc65db6069c3d342b79345c..40c5dbc96e5184c71f899e57015c1eb97c225f5f 100644 (file)
--- a/testsuite/gtk/ui/levelbar6.expected
+++ b/testsuite/gtk/ui/levelbar6.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <warbl>
+<input>:6:13 Unhandled tag: <warbl>

diff --git a/testsuite/gtk/ui/scale7.expected b/testsuite/gtk/ui/scale7.expected
index 7661a45af960cd111e58fd5bdc14137426584ebd..fa79467bc8518a1d6145058f5a12f4cbcb2e303a 100644 (file)
--- a/testsuite/gtk/ui/scale7.expected
+++ b/testsuite/gtk/ui/scale7.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <foo>
+<input>:6:11 Unhandled tag: <foo>

diff --git a/testsuite/gtk/ui/test1.expected b/testsuite/gtk/ui/test1.expected
index dcfceaea70c0670fd9134d53020213cee02d5683..4db4708f192558cb1cf5f5cb44bd8b9c6ac92c2b 100644 (file)
--- a/testsuite/gtk/ui/test1.expected
+++ b/testsuite/gtk/ui/test1.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <style>
+<input>:4:11 Unhandled tag: <style>

diff --git a/testsuite/gtk/ui/test2.expected b/testsuite/gtk/ui/test2.expected
index 871e994750a8cffcf38d058ff63b5404e69e2ae0..2f800fa2256c732b14b4a6a3faf53a28bb4e9d25 100644 (file)
--- a/testsuite/gtk/ui/test2.expected
+++ b/testsuite/gtk/ui/test2.expected
@@ -1,2 +1,2 @@
-ERROR: gtk-builder-error-quark 3
-<input>:3:1 'get-type' is not a valid attribute of <object>
+ERROR: g-markup-error-quark 4
+.:3:1 attribute 'get-type' invalid for element 'object'

diff --git a/testsuite/gtk/ui/test4.expected b/testsuite/gtk/ui/test4.expected
index 45d5b674927b95cff5cc98723ba7df3c543ee4aa..69e96d9ec9655dd3bcb236717ee0b0fcee1ccfb4 100644 (file)
--- a/testsuite/gtk/ui/test4.expected
+++ b/testsuite/gtk/ui/test4.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 1
-Unhandled tag: <random>
+<input>:3:43 Unhandled tag: <random>

diff --git a/testsuite/gtk/ui/test6.expected b/testsuite/gtk/ui/test6.expected
index 2acd0d0fd413921859a8da752855bb7bed7a0b53..20d6002eb5a35ff4fa31d42a84e718b6655f65dd 100644 (file)
--- a/testsuite/gtk/ui/test6.expected
+++ b/testsuite/gtk/ui/test6.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 8
-Duplicate object ID 'foo' on line 5 (previously on line 3)
+.:5:1 Duplicate object ID 'foo' (previously on line 3)

diff --git a/testsuite/gtk/ui/test7.expected b/testsuite/gtk/ui/test7.expected
index df08169b7eb8d98d9709778fa0e4f13897a80448..8f0795b97f5a2506df8290b3578f0a9b97914bb4 100644 (file)
--- a/testsuite/gtk/ui/test7.expected
+++ b/testsuite/gtk/ui/test7.expected
@@ -1,2 +1,2 @@
 ERROR: gtk-builder-error-quark 4
-<input>:4:1 'object' is not a valid tag here
+<input>:4:1 <object> is not a valid tag here